alert("this is from the test branch!");
alert("this is a test of rebasing, and this line is from the master branch");
//this is a line that I am adding to test that unstaged modifications enter in the remote when I commit this staged change
